From 09951b66a698df480282376a54f9673aaeb7de6f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 14 May 2008 09:19:05 +0100 Subject: [PATCH] xend: fix block protocol mismatch on save/restore The protocol field of the blkif interface is correct at startup for a guest of a different mode from dom0 (eg. 32-bit dom0, 64-bit guest). However, this property is not persisted on save, so a later restore (or migrate) will setup the block interface with the wrong mode. Signed-off-by: Herbert van den Bergh Signed-off-by: Kurt Hackel --- tools/python/xen/xend/server/blkif.py | 8 ++++++++ tools/python/xen/xm/create.py | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index a94bc66b3a..4a9282eb11 100644 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -89,6 +89,10 @@ class BlkifController(DevController): 'device-type' : dev_type } + protocol = config.get('protocol') + if protocol: + front['protocol'] = protocol + return (devid, back, front) def do_access_control(self, config, uname): @@ -162,6 +166,10 @@ class BlkifController(DevController): if uuid: config['uuid'] = uuid + proto = self.readFrontend(devid, 'protocol') + if proto: + config['protocol'] = proto + return config def destroyDevice(self, devid, force): diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 6c1b5c049c..7487086e37 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -610,7 +610,7 @@ def configure_image(vals): def configure_disks(config_devs, vals): """Create the config for disks (virtual block devices). """ - for (uname, dev, mode, backend) in vals.disk: + for (uname, dev, mode, backend, protocol) in vals.disk: if uname.startswith('tap:'): cls = 'tap' else: @@ -622,6 +622,8 @@ def configure_disks(config_devs, vals): ['mode', mode ] ] if backend: config_vbd.append(['backend', backend]) + if protocol: + config_vbd.append(['protocol', protocol]) config_devs.append(['device', config_vbd]) def configure_pci(config_devs, vals): @@ -845,7 +847,10 @@ def preprocess_disk(vals): n = len(d) if n == 3: d.append(None) + d.append(None) elif n == 4: + d.append(None) + elif n == 5: pass else: err('Invalid disk specifier: ' + v) -- 2.30.2